merge
authorack@localhost.localdomain <ack@localhost.localdomain>
Tue, 15 Aug 2006 10:16:46 +0000 (11:16 +0100)
committerack@localhost.localdomain <ack@localhost.localdomain>
Tue, 15 Aug 2006 10:16:46 +0000 (11:16 +0100)

Trivial merge